From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 4 Aug 2022 10:18:46 +0000 (+0200)
Subject: Rename recently added macro to follow conventions
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1886^2~462
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=759ccd7cba62e8414135c9e9a35576d15258ad5b;p=emacs.git

Rename recently added macro to follow conventions

* lisp/eshell/em-extpipe.el (eshell-extpipe--or-with-catch):
Rename from 'em-extpipe--or-with-catch'.
---

diff --git a/lisp/eshell/em-extpipe.el b/lisp/eshell/em-extpipe.el
index 3db1dea5955..7d81f27a18f 100644
--- a/lisp/eshell/em-extpipe.el
+++ b/lisp/eshell/em-extpipe.el
@@ -49,7 +49,7 @@
   (add-hook 'eshell-pre-rewrite-command-hook
             #'eshell-rewrite-external-pipeline -20 t))
 
-(defmacro em-extpipe--or-with-catch (&rest disjuncts)
+(defmacro eshell-extpipe--or-with-catch (&rest disjuncts)
   "Evaluate DISJUNCTS like `or' but catch `eshell-incomplete'.
 
 If `eshell-incomplete' is thrown during the evaluation of a
@@ -118,7 +118,7 @@ as though it were Eshell syntax."
                        (if (re-search-forward pat next t)
                            (throw 'found (match-beginning 1))
                          (goto-char next)
-                         (while (em-extpipe--or-with-catch
+                         (while (eshell-extpipe--or-with-catch
                                  (eshell-parse-lisp-argument)
                                  (eshell-parse-backslash)
                                  (eshell-parse-double-quote)